Merge branch 'non-recursive-activate' of https://github.com/jyasskin/cargo
authorAlex Crichton <alex@alexcrichton.com>
Mon, 21 Sep 2015 16:17:37 +0000 (09:17 -0700)
committerAlex Crichton <alex@alexcrichton.com>
Mon, 21 Sep 2015 16:17:37 +0000 (09:17 -0700)
1  2 
src/cargo/ops/cargo_package.rs

Simple merge